(toplevel): Require `jit-lock' only if

font-lock-support-mode is set to jit-lock-mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b57fb4e8c553c0f4ca7cb898f87c395fd2a26f8f..2f99a7a70cc6cb5960a615e8054d2f308d10151e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-05  Gerd Moellmann  <gerd@gnu.org>
+
+       * font-lock.el (toplevel): Require `jit-lock' only if
+       font-lock-support-mode is set to jit-lock-mode.
+
 2001-09-05  Eli Zaretskii  <eliz@is.elta.co.il>
 
        * international/quail.el (quail-use-package, quail-inactivate)

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index ba59b9568ead25d2af6ab8ee01037094560d677f..ef4bf6f2836a768024e7406bb056a942b789ccb2 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -2981,6 +2981,8 @@ See also `java-font-lock-extra-types'.")
 ;; Provide ourselves:
 
 (provide 'font-lock)
-(require 'jit-lock)
+
+(when (eq font-lock-support-mode 'jit-lock-mode)
+  (require 'jit-lock))
 
 ;;; font-lock.el ends here